Produced by Araxis Merge on 2021-05-13 09:09:06 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/layout | default.xml | 2019-12-13 07:50:32 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/layout | default.xml | 2021-04-28 12:40:00 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 426 |
| Changed | 0 | 0 |
| Inserted | 2 | 94 |
| Removed | 1 | 1 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | <?xml | 1 | <?xml | |||
| 2 | version="1.0" | 2 | version="1.0" | |||
| 3 | ?> | 3 | ?> | |||
| 4 | <!-- | 4 | <!-- | |||
| 5 | /** | 5 | /** | |||
| 6 | * Copyright © 2015 Magento. All rights reserved. | 6 | * Copyright © 2015 Magento. All rights reserved. | |||
| 7 | * See COPYING.txt for license details. | 7 | * See COPYING.txt for license details. | |||
| 8 | */ | 8 | */ | |||
| 9 | --> | 9 | --> | |||
| 10 | <page | 10 | <page | |||
| 11 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 11 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |||
| 12 | xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" | 12 | xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" | |||
| 13 | > | 13 | > | |||
| 14 | 14 | |||||
| 15 | <body> | 15 | <body> | |||
| 16 | 16 | |||||
| 17 | <referenceContainer | 17 | <referenceContainer | |||
| 18 | name="head.additional" | 18 | name="head.additional" | |||
| 19 | > | 19 | > | |||
| 20 | 20 | |||||
| 21 | <block | 21 | <block | |||
| 22 | class="Smartwave\Porto\Block\Template" | 22 | class="Smartwave\Porto\Block\Template" | |||
| 23 | name="porto_custom_head" | 23 | name="porto_custom_head" | |||
| 24 | template="html/head.phtml" | 24 | template="html/head.phtml" | |||
| 25 | before="-" | 25 | before="-" | |||
| 26 | /> | 26 | /> | |||
| 27 | 27 | |||||
| 28 | </referenceContainer> | 28 | </referenceContainer> | |||
| 29 | 29 | |||||
| 30 | <referenceContainer | 30 | <referenceContainer | |||
| 31 | name="after.body.start" | 31 | name="after.body.start" | |||
| 32 | > | 32 | > | |||
| 33 | 33 | |||||
| 34 | <block | 34 | <block | |||
| 35 | class="Magento\Newsletter\Block\Subscribe" | 35 | class="Magento\Newsletter\Block\Subscribe" | |||
| 36 | name="porto_newsletter_popup" | 36 | name="porto_newsletter_popup" | |||
| 37 | template="subscribe_popup.phtml" | 37 | template="subscribe_popup.phtml" | |||
| 38 | before="-" | 38 | before="-" | |||
| 39 | /> | 39 | /> | |||
| 40 | 40 | |||||
| 41 | <block | 41 | <block | |||
| 42 | class="Smartwave\Porto\Block\Template" | 42 | class="Smartwave\Porto\Block\Template" | |||
| 43 | name="porto_sidebar_sticky" | 43 | name="porto_sidebar_sticky" | |||
| 44 | template="html/sidebar_sticky.phtml" | 44 | template="html/sidebar_sticky.phtml" | |||
| 45 | after="-" | 45 | after="-" | |||
| 46 | /> | 46 | /> | |||
| 47 | 47 | |||||
| 48 | <block | |||||
| 49 | class="MSP\ReCaptcha\Block\Frontend\ReCaptcha" | |||||
| 50 | ||||||
| 51 | name="msp-recaptcha-newsletter" | |||||
| 52 | ||||||
| 53 | after="-" | |||||
| 54 | ||||||
| 55 | template="MSP_ReCaptcha::msp_recaptcha_newsletter_footer.phtml" | |||||
| 56 | > | |||||
| 57 | ||||||
| 58 | <arguments> | |||||
| 59 | ||||||
| 60 | <argument | |||||
| 61 | name="jsLayout" | |||||
| 62 | xsi:type="array" | |||||
| 63 | > | |||||
| 64 | ||||||
| 65 | <item | |||||
| 66 | name="components" | |||||
| 67 | xsi:type="array" | |||||
| 68 | > | |||||
| 69 | ||||||
| 70 | <item | |||||
| 71 | name="msp-recaptcha" | |||||
| 72 | xsi:type="array" | |||||
| 73 | > | |||||
| 74 | ||||||
| 75 | <item | |||||
| 76 | name="component" | |||||
| 77 | xsi:type="string" | |||||
| 78 | > | |||||
| 79 | MSP_ReCaptcha/js/reCaptcha | |||||
| 80 | </item> | |||||
| 81 | ||||||
| 82 | <item | |||||
| 83 | name="reCaptchaId" | |||||
| 84 | xsi:type="string" | |||||
| 85 | > | |||||
| 86 | msp-recaptcha-newsletter | |||||
| 87 | </item> | |||||
| 88 | ||||||
| 89 | <item | |||||
| 90 | name="zone" | |||||
| 91 | xsi:type="string" | |||||
| 92 | > | |||||
| 93 | newsletter | |||||
| 94 | </item> | |||||
| 95 | ||||||
| 96 | <item | |||||
| 97 | name="badge" | |||||
| 98 | xsi:type="string" | |||||
| 99 | > | |||||
| 100 | bottomright | |||||
| 101 | </item> | |||||
| 102 | ||||||
| 103 | <item | |||||
| 104 | name="settings" | |||||
| 105 | xsi:type="array" | |||||
| 106 | > | |||||
| 107 | ||||||
| 108 | <item | |||||
| 109 | name="size" | |||||
| 110 | xsi:type="string" | |||||
| 111 | > | |||||
| 112 | invisible | |||||
| 113 | </item> | |||||
| 114 | ||||||
| 115 | </item> | |||||
| 116 | ||||||
| 117 | </item> | |||||
| 118 | ||||||
| 119 | </item> | |||||
| 120 | ||||||
| 121 | </argument> | |||||
| 122 | ||||||
| 123 | </arguments> | |||||
| 124 | ||||||
| 125 | </block> | |||||
| 126 | ||||||
| 48 | </referenceContainer> | 127 | </referenceContainer> | |||
| 49 | 128 | |||||
| 50 | <referenceContainer | 129 | <referenceContainer | |||
| 51 | name="page.wrapper" | 130 | name="page.wrapper" | |||
| 52 | > | 131 | > | |||
| 53 | 132 | |||||
| 54 | <block | 133 | <block | |||
| 55 | class="Smartwave\Porto\Block\Template" | 134 | class="Smartwave\Porto\Block\Template" | |||
| 56 | name="porto_header" | 135 | name="porto_header" | |||
| 57 | template="html/header.phtml" | 136 | template="html/header.phtml" | |||
| 58 | before="main.content" | 137 | before="main.content" | |||
| 59 | > | 138 | > | |||
| 60 | 139 | |||||
| 61 | <block | 140 | <block | |||
| 62 | class="Magento\Framework\View\Element\Html\Links" | 141 | class="Magento\Framework\View\Element\Html\Links" | |||
| 63 | name="header.links" | 142 | name="header.links" | |||
| 64 | > | 143 | > | |||
| 65 | 144 | |||||
| 66 | <arguments> | 145 | <arguments> | |||
| 67 | 146 | |||||
| 68 | <argument | 147 | <argument | |||
| 69 | name="css_class" | 148 | name="css_class" | |||
| 70 | xsi:type="string" | 149 | xsi:type="string" | |||
| 71 | > | 150 | > | |||
| 72 | header links | 151 | header links | |||
| 73 | </argument> | 152 | </argument> | |||
| 74 | 153 | |||||
| 75 | </arguments> | 154 | </arguments> | |||
| 76 | 155 | |||||
| 77 | </block> | 156 | </block> | |||
| 78 | 157 | |||||
| 79 | <block | 158 | <block | |||
| 80 | class="Smartwave\Porto\Block\Form\Login" | 159 | class="Smartwave\Porto\Block\Form\Login" | |||
| 81 | name="header_customer_form_login" | 160 | name="header_customer_form_login" | |||
| 82 | ifconfig="porto_settings/header/login_popup" | 161 | ifconfig="porto_settings/header/login_popup" | |||
| 83 | template="Smartwave_Porto::html/login.phtml" | 162 | template="Smartwave_Porto::html/login.phtml" | |||
| 84 | /> | 163 | /> | |||
| 85 | 164 | |||||
| 86 | <block | 165 | <block | |||
| 87 | class="Magento\Store\Block\Switcher" | 166 | class="Magento\Store\Block\Switcher" | |||
| 88 | name="store_language" | 167 | name="store_language" | |||
| 89 | as="store_language" | 168 | as="store_language" | |||
| 90 | template="switch/languages.phtml" | 169 | template="switch/languages.phtml" | |||
| 91 | /> | 170 | /> | |||
| 92 | 171 | |||||
| 93 | <block | 172 | <block | |||
| 94 | class="Magento\Framework\View\Element\Template" | 173 | class="Magento\Framework\View\Element\Template" | |||
| 95 | name="top.search" | 174 | name="top.search" | |||
| 96 | as="topSearch" | 175 | as="topSearch" | |||
| 97 | template="Magento_Search::form.mini.phtml" | 176 | template="Magento_Search::form.mini.phtml" | |||
| 98 | /> | 177 | /> | |||
| 99 | 178 | |||||
| 100 | <block | 179 | <block | |||
| 101 | class="Smartwave\Porto\Block\Template" | 180 | class="Smartwave\Porto\Block\Template" | |||
| 102 | name="custom_block" | 181 | name="custom_block" | |||
| 103 | template="html/header_custom_block.phtml" | 182 | template="html/header_custom_block.phtml" | |||
| 104 | ifconfig="porto_settings/header/static_block" | 183 | ifconfig="porto_settings/header/static_block" | |||
| 105 | after="-" | 184 | after="-" | |||
| 106 | /> | 185 | /> | |||
| 107 | 186 | |||||
| 108 | <block | 187 | <block | |||
| 109 | class="Smartwave\Porto\Block\Template" | 188 | class="Smartwave\Porto\Block\Template" | |||
| 189 | name="custom_block_top" | |||||
| 190 | template="html/top_custom_block.phtml" | |||||
| 191 | ifconfig="porto_settings/header/static_block_top" | |||||
| 192 | after="-" | |||||
| 193 | /> | |||||
| 194 | ||||||
| 195 | <block | |||||
| 196 | class="Smartwave\Porto\Block\Template" | |||||
| 197 | name="custom_block_menu" | |||||
| 198 | template="html/header_custom_block_menu.phtml" | |||||
| 199 | after="-" | |||||
| 200 | /> | |||||
| 201 | ||||||
| 202 | <block | |||||
| 203 | class="Smartwave\Porto\Block\Template" | |||||
| 110 | name="porto_custom_notice" | 204 | name="porto_custom_notice" | |||
| 111 | template="html/custom_notice.phtml" | 205 | template="html/custom_notice.phtml" | |||
| 112 | after="-" | 206 | after="-" | |||
| 113 | /> | 207 | /> | |||
| 114 | 208 | |||||
| 115 | </block> | 209 | </block> | |||
| 116 | 210 | |||||
| 117 | </referenceContainer> | 211 | </referenceContainer> | |||
| 118 | 212 | |||||
| 119 | <move | 213 | <move | |||
| 120 | element="navigation.sections" | 214 | element="navigation.sections" | |||
| 121 | destination="porto_header" | 215 | destination="porto_header" | |||
| 122 | /> | 216 | /> | |||
| 123 | 217 | |||||
| 124 | <move | 218 | <move | |||
| 125 | element="top.search" | 219 | element="top.search" | |||
| 126 | destination="porto_header" | 220 | destination="porto_header" | |||
| 127 | /> | 221 | /> | |||
| 128 | 222 | |||||
| 129 | <move | 223 | <move | |||
| 130 | element="minicart" | 224 | element="minicart" | |||
| 131 | destination="porto_header" | 225 | destination="porto_header" | |||
| 132 | /> | 226 | /> | |||
| 133 | 227 | |||||
| 134 | <move | 228 | <move | |||
| 135 | element="currency" | 229 | element="currency" | |||
| 136 | destination="porto_header" | 230 | destination="porto_header" | |||
| 137 | /> | 231 | /> | |||
| 138 | 232 | |||||
| 139 | <move | 233 | <move | |||
| 140 | element="logo" | 234 | element="logo" | |||
| 141 | destination="porto_header" | 235 | destination="porto_header" | |||
| 142 | /> | 236 | /> | |||
| 143 | 237 | |||||
| 144 | <move | 238 | <move | |||
| 145 | element="skip_to_content" | 239 | element="skip_to_content" | |||
| 146 | destination="porto_header" | 240 | destination="porto_header" | |||
| 147 | /> | 241 | /> | |||
| 148 | 242 | |||||
| 149 | 243 | |||||
| 150 | <move | 244 | <move | |||
| 151 | element="page.top" | 245 | element="page.top" | |||
| 152 | destination="page.wrapper" | 246 | destination="page.wrapper" | |||
| 153 | after="porto_header" | 247 | after="porto_header" | |||
| 154 | /> | 248 | /> | |||
| 155 | 249 | |||||
| 156 | 250 | |||||
| 157 | <referenceContainer | 251 | <referenceContainer | |||
| 158 | name="header.container" | 252 | name="header.container" | |||
| 159 | remove="1" | 253 | remove="1" | |||
| 160 | /> | 254 | /> | |||
| 161 | 255 | |||||
| 162 | <referenceContainer | 256 | <referenceContainer | |||
| 163 | name="header.panel" | 257 | name="header.panel" | |||
| 164 | remove="1" | 258 | remove="1" | |||
| 165 | /> | 259 | /> | |||
| 166 | 260 | |||||
| 167 | <referenceContainer | 261 | <referenceContainer | |||
| 168 | name="header-wrapper" | 262 | name="header-wrapper" | |||
| 169 | remove="1" | 263 | remove="1" | |||
| 170 | /> | 264 | /> | |||
| 171 | 265 | |||||
| 172 | 266 | |||||
| 173 | <referenceContainer | 267 | <referenceContainer | |||
| 174 | name="footer-container" | 268 | name="footer-container" | |||
| 175 | > | 269 | > | |||
| 176 | 270 | |||||
| 177 | <block | 271 | <block | |||
| 178 | class="Smartwave\Porto\Block\Template" | 272 | class="Smartwave\Porto\Block\Template" | |||
| 179 | name="footer_block" | 273 | name="footer_block" | |||
| 180 | template="html/footer.phtml" | 274 | template="html/footer.phtml" | |||
| 181 | > | 275 | > | |||
| 182 | 276 | |||||
| 183 | <block | 277 | <block | |||
| 184 | class="Magento\Store\Block\Switcher" | 278 | class="Magento\Store\Block\Switcher" | |||
| 185 | name="footer.store_switcher" | 279 | name="footer.store_switcher" | |||
| 186 | template="switch/stores.phtml" | 280 | template="switch/stores.phtml" | |||
| 187 | /> | 281 | /> | |||
| 188 | 282 | |||||
| 189 | <block | 283 | <block | |||
| 190 | class="Magento\Newsletter\Block\Subscribe" | 284 | class="Magento\Newsletter\Block\Subscribe" | |||
| 191 | name="footer.newsletter" | 285 | name="footer.newsletter" | |||
| 192 | template="subscribe_footer.phtml" | 286 | template="subscribe_footer.phtml" | |||
| 193 | /> | 287 | /> | |||
| 194 | 288 | |||||
| 195 | </block> | 289 | </block> | |||
| 196 | 290 | |||||
| 197 | </referenceContainer> | 291 | </referenceContainer> | |||
| 198 | 292 | |||||
| 199 | 293 | |||||
| 200 | <referenceBlock | 294 | <referenceBlock | |||
| 201 | name="header.links" | 295 | name="header.links" | |||
| 202 | > | 296 | > | |||
| 203 | 297 | |||||
| 204 | <block | 298 | <block | |||
| 205 | class="Smartwave\Porto\Block\Template" | 299 | class="Smartwave\Porto\Block\Template" | |||
| 206 | name="custom_link" | 300 | name="custom_link" | |||
| 207 | before="-" | |||||
| 208 | template="html/custom_link.phtml" | 301 | template="html/custom_link.phtml" | |||
| 209 | /> | 302 | /> | |||
| 210 | 303 | |||||
| 211 | </referenceBlock> | 304 | </referenceBlock> | |||
| 212 | 305 | |||||
| 213 | </body> | 306 | </body> | |||
| 214 | </page> | 307 | </page> |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.